Merge branch 'wip/cssvalue'
authorAlexander Larsson <alexl@redhat.com>
Thu, 8 Mar 2012 16:33:18 +0000 (17:33 +0100)
committerAlexander Larsson <alexl@redhat.com>
Thu, 8 Mar 2012 16:33:18 +0000 (17:33 +0100)

Trivial merge